added validations
Merge pull request #26 from shaneob/shane

added validations