Towards 0.6.0 again.