Merge pull request #468 from negativeExponent/pads