Merge pull request #1 from satta/work

Small fixes and improvements
Revert "adjust batch size for Lucene index generation"

This reverts commit 4dd6b143eb01522ae89cb0163ce46d5a5e60da90.
Merge pull request #88 from satta/master

Revert Batch size change