Disabled use of salt + using 256 bits keys instead of 256 bytes keys
Merge remote-tracking branch 'origin/master'