KNL-112 #resolve + some polishing
Merge branch 'master' of https://github.com/Craftware/Kornell