Merge branch 'master' into FE
Merge pull request #34 from ModelWriter/FE

Merge branch 'FE' into master