Code cleanup and fix functionality.
Merge remote-tracking branch 'origin/master'

Conflicts:
	mccli.sh