hotfix on issue #1
Merge branch 'hotfix-v1.1.0'
Resolved merge conflicts