cleanup and hopefully fixed
Merge pull request #1 from Syrexide/master

cleanup and hopefully fixed