Merge pull request #491 from shaitan/master

Merging index shards and pytests.