Refactor around the function resolver
Merge pull request #109 from lyncodev/function-resolve-refactor

Refactor around the function resolver