more features
Merge pull request #6 from xduo/master

more features