Added proper support for an infinite range of ages (but removed one of the test criteria that depends on a finite age range