Fixed bugs

- Covered case when commentstring is not set (default).
- Escaping commentstring symbols.