Count code sections (fix #204)
Merge branch 'master' into development