Fixing bug with FYPP macros#931

sbryngelson merged 2 commits intoMFlowCode:masterMFlowCode/MFC:masterfrom

prathi-wind:macro-fixprathi-wind/MFC-prathi:macro-fixCopy head branch name to clipboard