0.6.2 and changes