Merge branch 'br1'
Merge branch 'master' of github.com:jeffreyytc/git0118