Lets fix things
Merge pull request #45 from MadkillerMax/dev

Lets fix things