Added new version of model
Merge branch 'develop'