Update for v1.0.2
Merge branch 'release/1.0.2'