Version 1.7

Lot of changes, 1.7