Meanwhile I have added Michal's suggestions and he reviewed again: https://gist.github.com/J-Gras/3ff4d5308a69e91fb61c65c12ecb818c Feel free to publish :) Jan