sanatize input better
Merge pull request #43 from teharrison/master

sanatize input better