Grigory bugfix
Merge remote-tracking branch 'origin/grigory'
Merge branch 'master' of https://github.com/DreamTeamADB/Code