Fixes from CH13
Merge branch 'master' of github.com:Shtaket/intelway
Changes by CH13