FIX: address @arjoly + @jakevdp comments