Updated model version and closes #35
Merge branch 'enhancement-#35' into develop