Fix mutual deps problem
Merge branch 'master' of github.com:mde/model