Revert, revert, REVERT
Merge pull request #50 from theodi/phil_edits

Revert, revert, REVERT