lots of changes
Merge pull request #22 from dan987/loadfiles

lots of changes