Merge branch 'dexx_addrindex_extended' into HEAD

Conflicts:
	README.md