Merging dev branch + new images