File I/O complete. Added and passed testMultiFileWriteAndLoad.
Merge branch 'master' into dat/model