Merge pull request #1 from AchillesWang/WangXiaoXiang

API