Merge branch 'dibaggioj' into bittelc

Conflicts:
	README.md
Merge branch 'master' into bittelc

Conflicts:
	README.md
Newest master

Newest master
Merge branch 'bittelc' into dibaggioj

Conflicts:
	README.md