more refactoring
more refactoring
Merge branch 'master' of https://github.com/tomay/model-manager
more refactoring