Merge pull request #170 from daverboy23/master

Encryption stuff temporarily removed