Merge pull request #1671 from dibdot/travelmate