Merge pull request #15 from Kuchiriel/add_travis