Automatically load resources
Merge branch 'pr/11'

Conflicts:
	Changes