Merge pull request #1658 from dibdot/travelmate