合并 #8

Open
p3ahs4flo wants to merge 7 commits from linlingfei_branch into master