fixed the dispatch table for functions (constructors worked ok)
Merge remote branch 'upstream/master'
Merge pull request #18 from roks/master

	fixed the dispatch table for functions