fix bugs.
fix bugs
Merge branch 'master' of https://github.com/sunivengg/Homework
fix bug