Added delimiter functionality. Relates #19