Added highlight option - closes #265