Merge pull request #17 from tlivings/master

simplified validator