Added delimiter handling.
Tests for delimiter handling.