fix validation regular expressions
Merge pull request #100 from ScottDuckworth/master

fix validation regular expressions