Done!
Merge pull request #28 from Syrexide/master

Done!