Merge tag 'v1.0.1'

v1.0.1
Merge branch 'release/1.0.2' into production