Merging
Merging
Fixing loading problem.
Removing dummy file.
Fixing loading problem.
Merge branch 'loading_problem'