Add more options for validation (fixes gh-6)
Merge pull request #11 from frankodwyer/develop

Add more options for validation (fixes gh-6)