Added scala support; removed delimitMate