Finish Hotfix-2.4.1
Merge pull request #10 from Celestibytes/master

Finish Hotfix-2.4.1