Fix for issue #52
Merge pull request #59 from arthurakay/master

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

Fixing issue #42 - component highlighting