Added changes for 1.0.2