dobj param rework
Merge branch 'master' into cstr

Conflicts:
	Makefile
	src/dobj.cc