Updated for 0.4.0 final.