The makefile
Merge branch 'w_makefile'
Fixed the makefile
Merge branch 'w_makefile'