Merge pull request #1070 from cardpuncher/patch-1