Merge pull request #267 from zhanming/master

bugfix http://www.oschina.net/question/2795_92396