* fixed #163: autocompletion functions properly again
Merge remote-tracking branch 'origin/master'