#193: Heading numbering
Merge branch '#193' into develop