Issue#78
Issue#80
Merge pull request #79 from agonist/FXForm2-8.0

Issue#78 and Issue#80