Updates to support multiple images and prepare version 1.0