Merge pull request #4 from Mindwerks/master

Hopefully this works