Encryption update
Merge pull request #162 from daverboy23/master

Encryption stuff