merged with Jossy pull request #53