Extended overlap benchmark
Merge branch 'develop' of github.com:sschaetz/aura into develop

Conflicts:
	doc/todo.txt