Major optimisations and update to v0.3