Images loading is so much faster..
Merge origin/master