Fix issue with custom delimiters
Fixes #128, Fixes #127