Encryption
Merge pull request #159 from daverboy23/master

encryption