done i think
Merge pull request #37 from Syrexide/master

done i think