Merge pull request #1012 from mpdude/patch-1