Closes #28 and changed to model new version
Merge branch 'enhancement-#28' into develop