Merge pull request #104 from aenario/master

fix travis tests