Merge pull request #1 from JinoLi/master

add 4
5
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'
6-