Issue #76
Merge pull request #77 from agonist/FXForm2-8.0

Fx form2 8.0