Merge pull request #1633 from dibdot/travelmate