a lot of improvements
follow-up
Merge branch 'master' of https://github.com/nazarov-andrey/subl-ocaml