Fix logic bug with index selection
Merge remote-tracking branch 'origin/master' into gh-master

Conflicts:
	setup.py