Bugfix #24 delimiter crap