oh shit
Merge pull request #30 from Syrexide/master

oh shit