Added lazy image loading
Merge