Updated
Merge branch 'dev' of github.com:k-int/gokb-phase1 into dev