修改多处bug
Merge branch 'master' of github.com:FandLee/qwas