hotfix 1.0.1 #1
hotfix 1.0.1 #2
Merge branch 'hotfix/1.0.1'