Merge branch 'master' into dibaggioj

Conflicts:
	README.md
merged master into dibaggioj

merged master into dibaggioj
Merge branch 'bittelc' into dibaggioj

Conflicts:
	README.md
Merge branch 'dibaggioj'