Merge pull request #1118 from dibdot/app-travelmate