fixes
Merge pull request #2 from surangak/validation-fix

fixes