Don't frighten the horses
Merge pull request #116 from debugwand/master

Don't frighten the horses