does this work too
Merge pull request #29 from Syrexide/master

does this work too