Add tab completions
Merge origin/master