more features
Merge pull request #38 from xduo/staging

more features