easy deploying
Merge branch 'hotfix/v1.1.2'