Updates CHANGELOG
Merge branch 'release/1.0.2'
Merge tag 'v1.0.2' into develop

Fixes