Updated for kk44 branch and fix typo..