Beautifying, refs #30
Improving elasticsearch repository, refs #23, closes #24