Added octal and hex support