Small changes after CR
Merge branch 'master' of github.com:kvas-damian/zid