Updated to manipulator v0.8 and generalized