added some validations
Merge remote-tracking branch 'upstream/master'
updated validations and populated params with correct values
Merge pull request #2 from ofayans/master

added some validations