v1.1 Fixed some important bugs.
Merge branch 'master' of ssh://git@github.com/lujcmss/Task7.git