updated the makefile
Merge branch 'test' into dev