Merge pull request #302 from deini/dev

Disabled ability to highlight