Support for custom delimiters (fixes #2)