Fixing validation issues, issue #363
Merge pull request #364 from meganap/fix_validation

Fixing validation issues, issue #363