Hoping this works to merge alex's changes to my fork

(Alex if this turns out to ask for you to pull from me, ignore it)