Manual merge of pull request #19. This adds multi-character delimiter.