Fix autocompletion
Merge pull request #320 from Icenium/tashkov/fix-autocomplete

Fix autocompletion