Update for v0.3.0 from rev 8b821a5