Merge pull request #1555 from ericschultz/patch-1