removed highlighting functionality for platforms other than Linux
cleanup
cleanup
Merge branch 'iss11'