Added option to enable and disable PKCS#7 padding