changed model
Merge branch 'master' into dev

to explain why this merge is necessary,