sanitize inputs more
Merge pull request #54 from teharrison/master

sanitize inputs more