Improve bash completion script