Update to latest ThorMaker