Merge pull request #1151 from polarbearing/patch-1