Fixing issue #42 - component highlighting
Merge pull request #60 from arthurakay/master

Fixing issue #42 - component highlighting