Update to 0.6.1
Finish 0.6.1