A bit more of a fix
Merge pull request #12 from Empeeric/master

A bit more of a fix