+ Restored support for GUI output
Merge origin/master