Custom delimiters

Pull request for #33