Models now get updated when they already exist
Merge remote-tracking branch 'origin/master'