Minor edit to Fei2007
Merge remote-tracking branch 'upstream/master'