Merge pull request #1445 from dibdot/travelmate