Synced ImageLoader with master to fix bugs