begin validating params
Merge branch 'master' into development