some bugfix

cc
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	eudtrg/__init__.py