Merge tag 'v1.0.2'

1.0.2
v1.0.3
Merge branch 'release/1.0.3' into production