added section/subsection numbering.. merged with master