@lsmith77 Ok, I will do a PR to solve #341, #332 and #300 - if there is any other issue to fix let me know.