Merge pull request #1267 from dibdot/travelmate