New weave
Merge branch 'master' of https://github.com/panoptix-za/HotRod