Dorota's pull request + some fixes in .travis.yml