Add validation
Merge branch 'develop_issue8' into develop