finished 21
Merge pull request #8 from yfly/master

finished 21