Merge branch 'hotfix-0.1.0' into develop
Added Fix for Preloading Files
Merge branch 'hotfix-0.1.1'