change AES encoding from hex to binary
Merge remote-tracking branch 'origin/master'