Fixes #12.
Also adds checking to padding; if it's at the right size, then it will pass it through.