added 'automatic' delimiter option & some refactor