Support hex and octal values, fixes #31