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

Code Review pull request