bug fixes
Merge pull request #55 from xduo/staging

bug fixes