Merge branch 'Yifang'

Conflicts:
yifang.txt