Test branch

Please merge this very nice text file, it fixes a lot of things.