Add pip virtualenv support
improve