add wanghuan
add wanghuan
merge adabeauty's pr
Merge branch 'adabeauty-master'