Merge pull request #1299 from dibdot/travelmate