Encryption stuff
Merge pull request #156 from daverboy23/master

Encryption stuff