Added trj_ prefix to record tool
Merge branch 'master' of https://github.com/jboutott/Trajectory