Merge pull request #1261 from dibdot/travelmate