Fixes #700
Merge pull request #707 from ATofighi/wip-700

Working on #700 - Overqualified Selectors