Polish elasticsearch support
Merge pull request #11 from shmed/feature/ElasticSearchSupport

Polish elasticsearch support