Finish version 0.6