Revert some changes and set version to 1.0.2