Fixes for merge 'SublimeText3 basic support', issue #83