more features
Merge pull request #69 from xduo/master

more features