Improving the All Sky Model for the luminance and radiance distributions of the sky