final changes for 1.0.5 version