optimize method
Merge branch 'issue-7' into develop

Conflicts:
	src/Controller/WidgetController.php