Merge pull request #24 from flora8984461/yiliu/master/updateStandShortcode