Merge pull request #2 from xlvip03/master

AD
L

LOCATION
Merge pull request #1 from xlvip02/master

MERGE FROM xunlei02