Merge pull request #1275 from dibdot/travelmate