fixed merge errors...akiva...
Merge pull request #4 from 16GordonA/update-function-creation

fixed merge errors...akiva...