Chaned main highlighter alorithm to resolve issue #77