Some small changes
Merge remote-tracking branch 'origin/master' into car-model
Merging car-model branch into master