Incorporation of susanne's ideas
ff
Merge branch 'foo'