Update for v0.2.0 from rev c32e3a5