Merge pull request #2021 from dibdot/travelmate