Merge pull request #3 from Mindwerks/master

Hopefully this works
Merge pull request #74 from chrisisonwildcode/master

Merge pull request #4 from Mindwerks/master