Updated to 2.0.8-final