Merge pull request #1476 from dibdot/travelmate