Updated for 0.5.0 release (again)