Added support for non-comma delimiter without breaking even-odd suppot