some update
Merge https://github.com/caddyWang/mylafe_rrmhj
some change