Selected commits from pull request #82

Selected commits from pr #82 that have to do with the autocompletion.