bugfix to #136 and dealing with issue #138
fix test failures
Merge pull request #139 from rmcgibbo/traj3

bugfix to #136 and dealing with issue #138