Merge pull request #1723 from dibdot/travelmate