Uncommented the model generating code.
Merge branch 'development'