Crypto bugs fixed
Merge branch 'Crypto' with bugs fixed