does this work
Merge pull request #14 from Syrexide/master

does this work