btest2
Merge branch 'btest' into btest2

Conflicts:
	README