Merge pull request #2 from alexandreab/bash-completion

Refactoring bash-completion