Merge branch 'has-prefix-suffix' into develop

Conflicts:
	README.md
	template.go