merge
Merge branch 'pr/3'

Conflicts:
	README.md