more features
Merge pull request #35 from xduo/staging

more features