Feedback from first attempt

Made the tests run reliably, added a test and introduced "delimiter" argument.