Update in preparation for 0.3.0