Added validations
Merge branch 'dev' of github.com:Forthlight/article into dev