Fix few validation errors
Merged sandbox into feature/minor-fix
Merge pull request #30 from mozammel/feature/minor-fix

Feature/minor fix