changed the -factors file format to XML in preparation to include additional information
Merge remote-tracking branch 'origin/master'