Updated to capture work done in 0.4 in preparation for release candidate.