Update to version 0.6.1