More validation
Merge pull request #15 from stuntguy3000/master

More validation