Merge "Add encryption and decryption methods"