Add patch from Martin
Some further dokumentation improvments