some more encryption stuff
Merge pull request #163 from daverboy23/master

encryption