update
Merge branch 'pr/5'

Conflicts:
	README.md