fix some problem
Merge branch 'master' of https://github.com/caofb/mehrk