Minor
Removed OpenFilesManager, renamed terminate() methods
Merge remote-tracking branch 'origin/master'