forked version of unmaintained project to be able to fix SE-3599 - View it on GitHub