@hawesg I have merged the pull. Thanks for the code cleanup it was needed.
Oh and for all of those interested. As promised: