refactor
bug fix
Merge pull request #28 from xduo/staging

refactor