Fixed images issue, needs to be tested

 Please enter a commit message to explain why this merge is necessary,
Fixed images issue, need to be tested