Making final changes for 1.0