units problem
clarify meaning of effective diameter
Merge branch 'master' into #524