Merge pull request #1718 from dibdot/travelmate