Bug fix for Github issue #165 and new equivalance class for 'digits' and 'number'

Signed-off-by: Nilkamal Weerasinghe <wnilkamal@yahoo.com>