Added escape code return, closes #3