Update to new v. 0.6.*