Merge pull request #441 from negativeExponent/patch-1