Merge pull request #32 from mikedup/master

Merge pull request #31 from mikedup/27-form-fixes
Merge pull request #33 from mikedup/27-form-fixes

Merge pull request #32 from mikedup/master