refacoter
Merge pull request #29 from xduo/staging

refacoter