cleaned up LoadFile and added tests
Merge pull request #51 from timbokopter/feature/cleanup_LoadFile

cleaned up LoadFile and added tests