fixed setting bug

Conflicts:
	README.md