Some bug fixes
Merge branch 'develop' into feature/variableBindings