fix 1
fix 1 and 2
fix 3
Merge branch 'fix3' into dev1

Conflicts:
	README.md