Fixes #1 - autocompletion