Fix for #117
Fix for issue #93 with missing highlighting of features.