update to support aes encrypt
Merge remote branch 'origin/master'