Refactor LoadFromFile
Refactor LoadFromFile
Refactor LoadFromFile
Refactor
Merge pull request #2 from Norgant/Refactor

Refactoring