Fixes #32
Merge pull request #33 from jriverac/improve_travis

Fixes #32