Hotfix 1.1 added
Merge branch 'hotfix/Version_1.1'