expose FuncMap
revert imports for now
Merge remote-tracking branch 'upstream/master'
Merge pull request #15 from rzab/master

Export funcMap