Type matching improved
Test for rational numbers added