bumb, updated rework to latest (master on github)