Merge branch 'hotfix/0.0.1'
Fix missing variable
Merge branch 'hotfix/0.0.2' into develop