Adding crude C++ indexer. Python bug fix.