Merge pull request #28 from tbuchanan/master

pull please
sprocket thingy
merging some sprocket conflicts
more sprocket thingies
pulled from group master