Merged 1.0.2 changes from master