Hotfix 1.0.2
Merge branch 'hotfix-1.0.2'