fixed clear up
fixed package
fixed merge conflict
fixed describe
fix
Merge pull request #1 from huxinghai1988/master

refactor