Updated to support more ciphers
Merge branch 'master' of https://github.com/frisco82/conceal