Merging dox improvements into develop branch.