Merge pull request #66 from fxbonnet/master

https://github.com/esigate/esigate/issues/59