merge

merge with kej_branch and master