Portal Highlighter - Infrastructure

Issue #435
Merge pull request #451 from vita10gy/infrastructure

Portal Highlighter - Infrastructure