Merge pull request #93 from fdelapena/master

Run travis a bit faster