Updated script to newest version and merged your changes into it

Probeerseltje :)