fixes a big bug introduced in the previous version (obviously rushing somethign)
Merge branch 'hotfix/undefined_variable' into develop
Merge branch 'hotfix/undefined_variable'
Merge branch 'develop'
1.2.1