I'll merge this now and I'll think harder about the problem when I find some time. One thing is certain - the project needs much more tests :-)