Added new ciphers
Added new cipher
Merge remote-tracking branch 'upstream/master'