tihomiro Merge pull request #177 from jxlwqq/patch-2