Merge pull request #1321 from dibdot/travelmate