Merging a fix for collimator bug. PR #23
Merging a fix for collimator bug. PR #23

PyORBIT-Collaboration/py-orbit,azukov/py-orbit,PyORBIT-Collaboration/py-orbit,PyORBIT-Collaboration/py-orbit,azukov/py-orbit,azukov/py-orbit