Merge pull request #68 from fxbonnet/master

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