added validation
Merge branch 'validation'

Merged validation into master.