Update for v0.2.0 from rev 205bf7a