Update for 1.7.0 and 2.0.0

one extra here too :-)