updated to allow mixture of new line and comma delimeters