Decrypting demo
Merge branch 'ian-master'