bug fixed
Merge branch 'master' of https://github.com/wailunho/project1