Add custom form support
Merge pull request #15 from peterkeen/custom-form

Add custom form support