Merge pull request #1691 from dibdot/travelmate