Merge pull request #16 from Toops/hotfix-0.0.4.2-2

Hotfix 0.0.4.2 2
Merge pull request #20 from wisthy/hotfix-0.0.4.2-2

Merge pull request #16 from Toops/hotfix-0.0.4.2-2