Merge pull request #1281 from dibdot/travelmate