Finish Hotfix-0.2.1
Merge pull request #1 from Celestibytes/master

Finish Hotfix-0.2.1