mecha fixes
Merge pull request #103 from alex-gh/mech_inv_fix

mecha fixes