Merge pull request #842 from narfbg/develop-encrypt

Improve the Encryption library