fixed kb bug
Merge branch 'kevin'