Improved makefile
Fixed travis yml