updated version
bumped cli version
merged and fixed