dogm-class edited
makefile
prepare merge