#56 Added better escape method
#56 Added better escape method 2
#57 Fixed ambigious branch coveragae