Makefile fixed
cli fixed
merge fixing
merge fixing
Merge branch 'cli'