Fix 6-character hex encoding
Merge branch 'parser-funcs'