Some optimizations
Bug fixed and faster
Merge branch 'cipher_parser'