Bugfix3
Merge branch 'terminalChanges'