update form to 2.1 requirements
Merge pull request #11 from jdewit/update-form

Update form to 2.1 requirements