Merge pull request #1829 from irei1as/patch-1