modified: .travis.yml, Makefile
Merge branch 'new_branch_name' into travis