Finish Hotfix-0.2.0-alpha.2
Merge pull request #2 from Celestibytes/master

Finish Hotfix-0.2.0-alpha.2