Finish Hotfix-0.4.2
Merge pull request #5 from Celestibytes/master

Finish Hotfix-0.4.2