Merge pull request #1 from RubyLouvre/master

sync
#341
Merge pull request #343 from zhiyan/master

fix #341