Merged 1.0.2 onto 1.0.0