Added cross section and scale factor tools
Merged master