resolved minor naming issue
Merge branch 'origin/tillBergen'