bug fixed
Merge branch 'master' of http://github.com/nicvsgodzilla/GroupHomework
semifinal version