working on.
Merge branch 'master' of https://github.com/tearsofphoenix/scintilla