Bugfix
Merge branch 'terminalChanges'