fix bug
conflict
commit to polish
Merge pull request #246 from wangbailin/master

live-empty