Improved encryption/decryption
Merge pull request #2 from harrygulliford/master

Improved encryption/decryption