adding validator
Merging validator from laura branch into master.

Merge remote-tracking branch 'origin/laura'