adding tab completion
Merge branch 'dev'