Added support for basic completion of short options