Update to deal with timeout and new distribute prerequisite of numpy