Merge branch 'hotfix/issue329'
Merge branch 'release/1.0.2'
Merge tag '1.0.2' into develop

Model refactoring and totally new test infrastructure