Merge Request

Includes
1)Fix for Issue #107(Command Spotlight Enhancement).