Updates in preparation for 0.5.0