Small changes. Added ability to receive unencrypted messages