Fix NUMBER_REGEXP

Fix regexp to match negative numbers, and numbers with less then 2 digits;