Added fix for lessthan/greaterthan characters

Change-Id: Id063e1cb88ed5f6b582a42773ae8a6268d83e158
Signed-off-by: Jeremy Ho <jujaga@gmail.com>