get method refactoring
Merge remote-tracking branch 'origin/rc1' into rc1

Conflicts:
	api/dimages.go