Merge pull request #11 from Windower/4.1-dev

Pull
Fixed Merge Issue
Merge pull request #973 from Podginator/4.1-dev

Merge Issue Fix - Highlight