Merge branch 'release/0.11.0' into develop
Merge branch 'master' into develop
Add initial unit tests, refactor code and fix the model generator (again)
Merge branch 'release/0.12.0'