Merge pull request #14 from chukong/master

merge master
issue #401
Merge pull request #422 from ZhaoTianze/master

about issue #401