Merge pull request #67 from tripzero/trip