Damn conflict! We make the first merge.

Merge enwei and wailing’s work