Merging pull request of @JKrag (thanks!), with some minor changes, mainly changing the output delimiter letter and adding some comments