Would be good to have this in 2.0 ;-)