Merge pull request #43 from ModelWriter/feature/test-feature

Feature/test feature
Merge branch 'hotfix/test-bug' into develop