Adding changes for 1.0.1