Closes #32
Merge branch 'enhancement-#32' into develop
Closes #33
Merge branch 'enhacenment-#33' into develop
Fixed errors in test because of new translations
Closes #34
Merge branch 'enhancement-#34' into develop
Updated model version and closes #35
Merge branch 'enhancement-#35' into develop
Merge branch 'develop'