Another go...
Merge pull request #28 from DeckOfPandas/tools

Another go...