Add function wrap and parallel
Merge branch 'master' of /lx/calcite/my/project/.git/async

Conflicts:
	package.json