merge from origin/smt again
again merged
removing dbug option in Makefiles