Fix to complete the build#164

601t wants to merge 5 commits intoNanoComp:masterNanoComp/mpb:masterfrom

601t:master601t/mpb:masterCopy head branch name to clipboard