Feature/elasticsearch v3

prior pull request: #25
further work: see commit messages
same here with error