fixed resource loading (fixed)
Merge remote-tracking branch 'origin/master'