Merge pull request #85 from AndreasA/master

[TASK] All changes together
[TASK] Small bugfix and CGL adjustment
Merge remote-tracking branch 'upstream/master'