Fixed image path
Merged conflicts with master