fix bugs
Merge branch 'master' of github.com:song-yuan/project2