Fix mp model build bug.
Merge pull request #23 from d2rk/fix_mp_model_build_bug

Fix mp model build bug
Merge remote-tracking branch 'upstream/master' into tmpbranch
With errors
It might work.