hide code path and merge remote

Conflicts:
	codegen.py