Merge pull request #38 from fiddler-crabs-2014/master

Closing a duplicate merge