starius Merge pull request #2 from starius/fix-travis