Merge branch 'release-1.0.1' into develop
Add magic encoding comment
Bump version to 1.0.2
Merge branch 'release-1.0.2'