More validation
Merge pull request #16 from stuntguy3000/master

More validation