more features
Merge pull request #22 from xduo/staging

more features