fixing validation errors
Merge branch 'master' into validation