Removing merge mistake
Merge pull request #24 from dannybutler/master

Removing merge mistake