Update for v0.5.0 from rev 3335adf