Attempted solution
Merge branch 'cryptofix' into demo