merge conflicts resolved
Merge pull request #1259 from KrzysztofCiba/fix-subprocessMM

FIX: subprocess