fixed major bug

Conflicts:
	README.md