Merge branch 'CL-181'

Conflicts:
	README.md