bug fix
Merge pull request #32 from xduo/staging

bug fix