Escape bug fix and few tweaks
Removed echo statement
Merge pull request #11 from JackLeo/master

Escape bug fix and few tweaks