Issue #55

Remove wrong import
Merge branch 'master' into FXForm2-8.0