Merge pull request #1703 from dibdot/travelmate