Merge branch 'master' into Dev-Eric
header information can now be read from the mdl file
Merge branch 'Dev-Eric'