Merge pull request #4 from Latros/master

Update Request
Lots of validation changes
Merge pull request #5 from Latros/master

Update Request
Merge pull request #6 from Latros/Matt

Validation changes