Merge branch 'issue-3'

Conflicts:
	README.md