Fix for Issue 16 and 18 with highlighting

Signed-off-by: nishtha <nishtha2479@gmail.com>