fixed version
Merge branch 'hotfix/1.1'