Merge pull request #3 from Jan-E/v1.1.x