more features
Merge pull request #24 from xduo/staging

more features