Adding more validations
Merge pull request #11 from darbyfrey/more_validations

Adding more validations