Test

Fixed bugs in .travis.yml and makefile