Bug fix 2

- handy to set the correct variable names
Merge branch 'Development'