final changes for 1.0.0