added support of different separators