part c, d
Merge branch 'master' into jannes