fixing image path
Merge origin/master