Merge branch 'feature/variableBindings' into develop. See issue #18