fixed Makefile
fixed travis.yml
fixed travis.yml
fixed .travis.yml
Merge branch 'merge/20'