map is now an image
Merge origin/master