added validation
Merge branch 'master' of github.com:tsvetann/wiki-on-air