Update master to 1.0.2