Updated for sklearn 0.15.2