bug fix
Merge pull request #36 from xduo/staging

Adjustment