#30 - elasticsearch 1.4 compatibility
Merged master change