Use correct form helpers.
Merge pull request #2 from caike/master

Use correct form helpers.