Merge pull request #2 from FrancescAlted/travis