Merge branch 'hotfix/1.0.1'
Bug fix.
recompile
Merge branch 'hotfix/1.0.2' into develop