Model associations improved, close #1
Merge branch 'improvement/#1' into develop