Updated model with better names at interface
Merge branch 'master' of github.com:openETCS/model-evaluation