Modification for release 1.0.0