Merge pull request #1417 from felixonmars/patch-1