Add Hex and Base64 encoding
Fix for review comments
Merge remote-tracking branch 'chen3feng/develop'
use hex encoding, add more testcases