Merge pull request #1468 from dibdot/travelmate