Added PKCS7 padding, and CBC mode