Merge pull request #58 from bethjohnson/master
(refactor) Minimally better, still ugly