Minor correction
Removing some testing functions and compilation warnings
Unifying header styles for outputs
Uncommenting wrongly commented loop in Makefile
.
Merge remote-tracking branch 'origin/master'