more features
Merge pull request #54 from xduo/staging

more features