Update to 1.7

I want your changes. :))