form validation
Merge branch 'iss53'