[Polish Week] task 19
[Polish Week] task 23
Merge pull request #61 from lixiaopeng/master

Polish Week Task