Closes #1 Adding support to numbers