Improved bash completion