Merge pull request #1662 from dibdot/travelmate