Finish 0.1 version