Update to Version 2.0.7