Adding x-loader code
Merge branch 'new_branch'