v1.2.0 - final changes