Merge pull request #2589 from castillofrancodamian/travelmate