bug2
Merge branch 'bug' into bug2

Conflicts:
	README.md
bug4
Merge branch 'bug4'

Conflicts:
	README.md