Merge pull request #1423 from Neumann-A/patch-1