fix some bug
Merge pull request #2 from LewisGet/staging

fix some bug