Finish 0.6.0