Encryption
Merge pull request #157 from daverboy23/master

encryption