fix numbers support; add unittests

Signed-off-by: Roman Yeryomin <roman@advem.lv>