merged @afein
updated makefile (make sure to set debug or not)