checkout fixes
mergeMerge branch 'master' of github.com:loranc/kebu