fix bug on validation
Merge branch 'master' into feature/specification
updated specifications