modify the record
refactor code package
fix test error
add the version
Merge pull request #653 from youyong205/master

refactor code
refactor code
Merge pull request #654 from youyong205/master

refactor code
resolve conflicts
Merge branch 'master' of https://github.com/dianping/cat