Finishing for 0.5 release