bug fix
Merge pull request #33 from xduo/staging

bug fix