improved form validation
Merge branch 'master' of https://github.com/rutsch/sandbox