Merge pull request #1473 from dibdot/travelmate