Merge pull request !395 from 马小法/master
Merge pull request !391 from 18297093310/jieoschina-master-patch-51652