Add form fix for #256
more form fixes
Merge pull request #3 from opencomparison/master

Master