Merge branch 'hotfix-1.0.1'
Fix wrong access function.
Merge branch 'hotfix-1.0.2' into develop