some small bugs fixed
Merge branch 'master' of https://github.com/wgychris/Task7.git