add option to default to hex to keep backward compatibility
Merge branch 'master' into release