this should work
Merge pull request #1 from Tmee/master

this should work