Adding more to the model
Merge remote-tracking branch 'origin/master'