Cleanup
Merge pull request #54 from pmuir/fix_master

Cleanup