Dear @piterpunk and @rworkman ,
Same changes from last PULL-REQ, but with a clean commit history. (Only a single commit).
Best, @drbeco