Bugfix in model creation.
Merge remote-tracking branch 'origin/master'