Fix autocompletion
Sync with latest changes in submodule
Merge pull request #363 from Icenium/fatme/fix-autocompletion

Some bug fixes