Merge pull request #192 from alex/pkcs7-padding

PKCS7 padding