Merge framework into highlighter library. Fixes #65