(refactor) Not broken, but ugly
Merge pull request #58 from bethjohnson/master