v1.1.1
Merge commit 'e200627'

Conflicts:
	README