Merge pull request #240 from dizzzz/feature/improve_lucene_codebase

Feature/improve lucene codebase