Fixes
Merge pull request #9 from PhaxeNor/master

Fixes