Merge pull request #436 from negativeExponent/patch-1