fix bug in sweep; come changes
Merge branch 'workBranch' of https://github.com/danyaberezun/diploma into workBranch