Finish Hotfix-1.0.2
Merge pull request #3 from Celestibytes/master

Finish Hotfix-1.0.2