Updates for ES 1.0

This PR should fix ES 1.0 compatibility. I tested it as snapshot dependency in my local maven repository and everything works in my project. Also unit tests still pass so I'd assume that it works with the latest ES version.

Is there anything else I can do to get this merged?

Should fix #38