Merge pull request #1 from matthewlein/master

273 is looking pretty sweet!