Fixes elasticsearch/kibana issue #151
Merge pull request #157 from marceldegraaf/master

Fixes issue #151
Merge remote-tracking branch 'upstream/master'