NULL values bug fix
Merge branch 'master' of git@github.com:antonmks/Alenka.git