Merge pull request #1270 from dibdot/travelmate