update @marks fork to @kgautreaux latest