Merge pull request #1547 from nydr/patch-1