Changed index base for consistency with Chris
Merge remote-tracking branch 'mazen/master'

Conflicts:
	examples/main-parallel
	examples/main-serial