motor form fixed
Merge remote-tracking branch 'mach/master'
fixed torque in harmonic field