Merge pull request #13 from dianping/master

from dianping to jin
Merge pull request #14 from dianping/master

from dianping to jin
Merge pull request #15 from dianping/master

from dianping to jin
Merge pull request #16 from dianping/master

from dianping to jin
Merge pull request #17 from dianping/master

from dianping to jin
Merge pull request #18 from dianping/master

from dianping to jin
modify some ut
remove flush
Merge pull request #19 from dianping/master

from dianping to jin
fix conflicts
Merge pull request #41 from LantaoJin/master

merge