Merge framework into highlighter library. Fixes #65
Merge pull request #66 from jorgesilva/issue-65

Merge framework into highlighter library. Fixes #65