Fixed Makefile and .travis.yml