improved autocompletions - fix #239
coding style fix - #239
Merge pull request #247 from stefanjudis/feature/239-autocompletion-improvements

Feature/239 autocompletion improvements - fix #239