headings fixed
merging master