fixed diameter.cpp
Merge branch 'r2_branch'