Merged AndersTornqvists changes. Replaced recoding indication (dots) by an (awkwardly coded) mill
Merge https://github.com/olreti/spori