correct merge error
not stable version: start allLots
Merge remote-tracking branch 'github/mihai' into mihai