some changes..
Merge pull request #1 from zalora/zhenling

some changes..