v1.0.0 - final changes