validation
Merge pull request #27 from marqh/morevalidating

Morevalidating