Fixed some validation issues
Merge pull request #32 from lal-ace/development

Fixed some validation issues