WIP
Merge pull request #424 from remy/fix/travis

fix travis tests