More changes.
Merge branch 'master' of github.com:jafp/dsm4_final_report