Form update
Merge pull request #25 from profbass/master

Form update