fixing the build
cleaning up the models generator
Merge remote-tracking branch 'origin/master'