trip revised.
Merge pull request #15 from matcho3/trip

trip revised.