resolves #19
Merge pull request #20 from mozboz/fixForm

resolves #19