Hello,

attached what I think could be the final version, once the license question 
is decided.

Andreas