Updated constructor
Merge remote-tracking branch 'origin/lucene' into lucene