First stable version of model mapping
Closes #5
Merge branch 'enhancement-#5' into develop