add validators
Merge origin/master