big fix
Merge pull request #27 from ErikFang/master

big fix
Merge pull request #12 from dianping/master

from dianping to jin