Improved Makefile documentation
Merge branch 'ccntlv' into dev-master