Brought code up to date#145

bobo-baggins wants to merge 2 commits intoleogoesger:masterleogoesger/func-flow:masterfrom

bobo-baggins:masterbobo-baggins/func-flow_WORKING:masterCopy head branch name to clipboard