Improved loading, refactored...
Merge branch 'master' of https://github.com/Machtan/First-year-project