more features
Merge pull request #21 from xduo/staging

more features