improve section
Merge branch 'develop' into issue366