yourtilde
master
As much as I could merge this myself I do want approval from the community before I bring this back into the fold. Thanks