added validation
Merge origin/master