Updates added from v1.0.2a