Fixed cryptography
Merge branch 'master' of https://github.com/Drarqua-Storm/TRM-Client