Merged cli branch into master