bugfix #1
fix #1
Conflicts:
	README.md