Merge pull request #12 from Toops/hotfix

Hotfix 1
Merge pull request #13 from wisthy/hotfix-0.0.4.2-1

Hotfix 0.0.4.2 1