Merge pull request #2 from PanJiaChen/23

23