Finalized 0.6.0