Handle private variable inside block
Merge branch 'develop' into release/0.3.x
Bump version: v0.3.1 -> v0.3.2