Merge pull request #2202 from dibdot/travelmate