Merge "Add virtual enviroment support for cli"