finished 22
Merge pull request #5 from yfly/master

finished 22