Fix for issue #107 (multiple trajectories) and 32 compilation issues