ENH: take @jakevdp  comments into account