resolved issues with trips
Merge branch 'master' of github.com:zynne/redo-air