FIXES: #493 Minor Html encode
FIXES: #494 Due to Case Sensitive
Merge pull request #111 from sathishinlinux/master

FIXES: #493,#494