modify keyconf
merge branch modify-keyconf