Use empty form to determine fields
Merge branch 'develop' of github.com:ff0000/scarlet into develop