Add g++ optimization flags in Makefile
Merge branch 'optim_flags' into unit_testing