Merge pull request #116 from teharrison/master

overhaul