Merge pull request #578 from mayeut/travis-ci