Merge pull request #425 from nelenkov/dev

Better developer name and comment reply error handling, see #424
Merge pull request #426 from nelenkov/dev

preparing for v2.5.1 release
handle single escape as well