Merge pull request #168 from daverboy23/master

encryption