Finish Hotfix-2.4.2
Merge pull request #11 from Celestibytes/master

Finish Hotfix-2.4.2