Cleanup
Merge branch 'experimental' of https://github.com/Ximi1970/spksrc into experimental