Merge pull request #2 from Mindwerks/master

oops Try that again
Merge pull request #68 from chrisisonwildcode/master

Merge pull request #2 from Mindwerks/master