Thanks for making it generic.  :-)

Please add a unit test for regression.