Patch to non-clearing form, issue #19
Merge remote-tracking branch 'origin/beta' into live