Merge branch 'Autocomplete_revised'
Minor changes to auto-complete
Merge branch 'master' into Autocomplete_revised