few changes
Merge remote-tracking branch 'upstream'