Merge pull request #1524 from dibdot/travelmate