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

Code Review pull request
Merge pull request #63 from rmw/master

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