Updating Makefile and travis file