form update
Merge pull request #249 from dotch/master

form update