Update and new ERM models
Merge branch 'master' of github.com:guenterh/fsw