Update to latest rework and bump version