Updated to 2.0.7-final