update canopy cli
merge master