Version 0.0.2. Indexes added.
Merge pull request #8395 from shmidt/master

Version 0.0.2. Indexes added.