Merge pull request #81 from banacorn/lsp#267