File load fix
Merge pull request #26 from davghouse/develop

File load fix