refactor
resolve conflicts
fix bug
clean code
fix bug
revert
modify test case
Merge pull request #679 from jialinsun/master

fix bug