Revert to 1.0.2 in order to merge