Final 0.5 update