Final corrections with Drol and Thalley
Merge branch 'master' of github.com:mikkelam/D502e13