Issue 1: Add Way Images completed
Merge branch 'wayimages'
Unified intendation style.