Minor update for project
Merge remote-tracking branch 'upstream/master'