refactor the code
Merge branch 'master' of github.com:shuhuai007/cfi
refactor the code