format code
slight change
Add hex & oct numeric support