Improve cipher detection
Merge pull request #8 from linusyang/cipher

[Encryption] Improve cipher detection