Updated for release 0.4.0.