Fixes for scanner.
Merge branch 'master' of https://github.com/borys-kupar/we-lviv