Merge branch 'rs/hex2chr'