Finalizing v0.4 alpha