Finish Hotfix-0.11.1
Merge pull request #1 from anttikivi/master

Finish Hotfix-0.11.1