Commit for master merge
More ERB
Fixed images
Fixed images