new form version
Merge pull request #252 from dotch/master

new form version