Stolen extension methods :)
Updated tests
Travis